d/p/06: update soname patch to use ABI version

diff --git a/debian/changelog b/debian/changelog
index 0f562ead8118158585e22079cbcdbbf8b14f1b08..11e9ecd60e297ae5a7dd10de16b17eb8b66b4986 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dcmtk (3.6.1~20150924-6) UNRELEASED; urgency=medium
+
+  * New upstream version 
+  * d/p/06: Update patch to use ABI version as part of the library name 
+
+ -- Gert Wollny <gw.fossdev@gmail.com>  Sat, 09 Apr 2016 12:23:46 +0000
+
 dcmtk (3.6.1~20150924-5) unstable; urgency=medium
 
   * d/libdcmtk-dev revert last change since ITK-4.9 now supports

diff --git a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
index 566d441550cc59dc6e448e7a0ac77b10f7d889b5..9309cecb4893ea16423c83ed7809325acec21125 100644 (file)
--- a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
+++ b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
@@ -19,7 +19,7 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
 \r
 --- a/CMake/osconfig.h.in
 +++ b/CMake/osconfig.h.in
-@@ -1102,4 +1102,16 @@ typedef unsigned long ulong;
+@@ -1137,4 +1137,16 @@
  /* The path on the Android device that should be used for temporary files */
  #cmakedefine ANDROID_TEMPORARY_FILES_LOCATION "@ANDROID_TEMPORARY_FILES_LOCATION@"
  
@@ -38,7 +38,7 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  #endif /* !OSCONFIG_H*/
 --- a/config/aclocal.m4
 +++ b/config/aclocal.m4
-@@ -1490,6 +1490,47 @@ else
+@@ -1490,6 +1490,47 @@
  fi
  ])
  
@@ -88,7 +88,7 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  dnl CHECK_VLA checks if the C Compiler supports variable-length arrays
 --- a/config/configure
 +++ b/config/configure
-@@ -14575,6 +14575,66 @@ $as_echo "no" >&6; }
+@@ -15004,6 +15004,66 @@
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
@@ -157,7 +157,7 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  
 --- a/config/include/dcmtk/config/osconfig.h.in
 +++ b/config/include/dcmtk/config/osconfig.h.in
-@@ -75,6 +75,9 @@
+@@ -92,6 +92,9 @@
  /* Define if __attribute__((aligned)) is available */
  #undef HAVE_ATTRIBUTE_ALIGNED
  
@@ -167,7 +167,7 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  /* Define to 1 if you have the `bcmp' function. */
  #undef HAVE_BCMP
  
-@@ -263,6 +266,9 @@
+@@ -286,6 +289,9 @@
  
  /* Define if __alignof__ is available */
  #undef HAVE_GNU_ALIGNOF
@@ -179,7 +179,7 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  #undef HAVE_GRP_H
 --- a/ofstd/tests/toption.cc
 +++ b/ofstd/tests/toption.cc
-@@ -15,6 +15,11 @@ OFTEST(ofstd_optional)
+@@ -17,6 +17,11 @@
  
      OFoptional<int> o0( 3 ), o1, o2( OFnullopt );
  

diff --git a/debian/patches/05_performance.patch b/debian/patches/05_performance.patch
index cf73c91c6d802dac7a46fce815322745dc6b5a44..78ea45f0231b9e3d2e7e91c181c24ea1f7b39ac5 100644 (file)
--- a/debian/patches/05_performance.patch
+++ b/debian/patches/05_performance.patch
@@ -6,7 +6,7 @@ Description: Fix a DCMTK performance problem
 
 --- a/dcmnet/libsrc/dul.cc
 +++ b/dcmnet/libsrc/dul.cc
-@@ -1833,7 +1833,7 @@ receiveTransportConnectionTCP(PRIVATE_NE
+@@ -1841,7 +1841,7 @@
          return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
      }
  #endif
@@ -17,7 +17,7 @@ Description: Fix a DCMTK performance problem
      /*
 --- a/dcmnet/libsrc/dulfsm.cc
 +++ b/dcmnet/libsrc/dulfsm.cc
-@@ -2421,7 +2421,7 @@ requestAssociationTCP(PRIVATE_NETWORKKEY
+@@ -2431,7 +2431,7 @@
            return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
          }
  #endif

diff --git a/debian/patches/06_soversion_abi.patch b/debian/patches/06_soversion_abi.patch
index 3a24e6230984862b3a09581defb59f80b331fafa..e293e58bdd46a00dd6dbdf573ce221d92ccb0924 100644 (file)
--- a/debian/patches/06_soversion_abi.patch
+++ b/debian/patches/06_soversion_abi.patch
@@ -1,14 +1,15 @@
 Description: Add abi-version to library name 
 Author: Gert Wollny <gw.fossdev@gmail.com>
+Last-Update: 2016-04-09
 
---- a/CMake/dcmtkPrepare.cmake 2015-10-28 15:16:05.279429955 +0100
-+++ b/CMake/dcmtkPrepare.cmake 2015-10-28 15:17:11.058822022 +0100
+--- a/CMake/dcmtkPrepare.cmake
++++ b/CMake/dcmtkPrepare.cmake
 @@ -56,7 +56,7 @@
  #SET(DCMTK_PACKAGE_URL "http://www.dcmtk.org/")
  
  # Shared library version information
 -SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_ABI_VERSION}")
-+SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}.abi2" SOVERSION "${DCMTK_ABI_VERSION}")
++SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_ABI_VERSION}.${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_ABI_VERSION}")
  
  # General build options and settings
  OPTION(BUILD_APPS "Build command line applications and test programs." ON)